merge trunk
authorKenichi Handa <handa@etlken>
Wed, 28 Apr 2010 01:00:38 +0000 (10:00 +0900)
committerKenichi Handa <handa@etlken>
Wed, 28 Apr 2010 01:00:38 +0000 (10:00 +0900)
commit5a07ecede8c0d52760079733cc392b7e91771767
tree343a3f3061f1a3641182543db1913aa2b2df3d54
parentaf1fb1ef02928c99deaadca334ea31b1c6749dfe
parent33aaa9d6d5400825c95321bf2c6c97db3c36164e
merge trunk